Messed with the waste handling to reduce the amount of track needed